Remove some accidentally committed duplicate code.

Tue Oct 28 12:20:16 2003  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkwindow.c (gtk_window_has_toplevel_focus): Remove
        some accidentally committed duplicate code.

diff --git a/ChangeLog b/ChangeLog
index f3b18808695965a6bb482f948306c2dd996d4c98..4045df270aa3b426e126563f6018c0f6bbaf4be5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
+Tue Oct 28 12:20:16 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_has_toplevel_focus): Remove
+       some accidentally committed duplicate code.
+
 Tue Oct 28 17:06:17 GMT 2003  Tony Gale <gale@gtk.org>
-                                                                                                                                   
+
         * docs/faq/gtk-faq.sgml: Update info on compiling GTK+
 
 Tue Oct 28 10:34:24 2003  Owen Taylor  <otaylor@redhat.com>

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f3b18808695965a6bb482f948306c2dd996d4c98..4045df270aa3b426e126563f6018c0f6bbaf4be5 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
+Tue Oct 28 12:20:16 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_has_toplevel_focus): Remove
+       some accidentally committed duplicate code.
+
 Tue Oct 28 17:06:17 GMT 2003  Tony Gale <gale@gtk.org>
-                                                                                                                                   
+
         * docs/faq/gtk-faq.sgml: Update info on compiling GTK+
 
 Tue Oct 28 10:34:24 2003  Owen Taylor  <otaylor@redhat.com>

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f3b18808695965a6bb482f948306c2dd996d4c98..4045df270aa3b426e126563f6018c0f6bbaf4be5 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,10 @@
+Tue Oct 28 12:20:16 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_has_toplevel_focus): Remove
+       some accidentally committed duplicate code.
+
 Tue Oct 28 17:06:17 GMT 2003  Tony Gale <gale@gtk.org>
-                                                                                                                                   
+
         * docs/faq/gtk-faq.sgml: Update info on compiling GTK+
 
 Tue Oct 28 10:34:24 2003  Owen Taylor  <otaylor@redhat.com>

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f3b18808695965a6bb482f948306c2dd996d4c98..4045df270aa3b426e126563f6018c0f6bbaf4be5 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,10 @@
+Tue Oct 28 12:20:16 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_has_toplevel_focus): Remove
+       some accidentally committed duplicate code.
+
 Tue Oct 28 17:06:17 GMT 2003  Tony Gale <gale@gtk.org>
-                                                                                                                                   
+
         * docs/faq/gtk-faq.sgml: Update info on compiling GTK+
 
 Tue Oct 28 10:34:24 2003  Owen Taylor  <otaylor@redhat.com>

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f3b18808695965a6bb482f948306c2dd996d4c98..4045df270aa3b426e126563f6018c0f6bbaf4be5 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,10 @@
+Tue Oct 28 12:20:16 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_has_toplevel_focus): Remove
+       some accidentally committed duplicate code.
+
 Tue Oct 28 17:06:17 GMT 2003  Tony Gale <gale@gtk.org>
-                                                                                                                                   
+
         * docs/faq/gtk-faq.sgml: Update info on compiling GTK+
 
 Tue Oct 28 10:34:24 2003  Owen Taylor  <otaylor@redhat.com>

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 35f409f51336bd93f9ecddbd48a2586b357f64ef..ab1069a46e26be1b0966b6a274d9eda511beece2 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -6389,29 +6389,6 @@ gtk_window_has_toplevel_focus (GtkWindow *window)
   return window->has_toplevel_focus;
 }
 
-/**
- * gtk_window_get_is_active:
- * @window: a #GtkWindow
- * 
- * Returns whether the window is part of the current active toplevel.
- * The return value is %TRUE if the window is active toplevel
- * itself, but also if it is a GtkPlug embedded in the active toplevel.
- * You might use this function if you wanted to draw a widget
- * differently in an active window from a widget in an inactive window.
- * 
- * Return value: %TRUE if the window is the current active window.
- *
- * Since: 2.4
- **/
-static gboolean
-gtk_window
-_is_active (GtkWIndow *window)
-{
-  g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
-
-  return window->is_active;
-}
-
 static void
 gtk_window_group_class_init (GtkWindowGroupClass *klass)
 {